First working version
Merge to enable pushing from local to Github
More information