Initial commit in the first branch

First merge into master