Fixing the git mess
Merge pull request #7 from Berco/master

Fixing the github mess