git shit done
Merge pull request #9 from francinen/master

git shit done