Merge pull request #55 from ebarboni/master

First step to put all the commit back with history from the splitted repo