merge conflicts
Merge pull request #13 from Herzucco/patch-master

merge conflicts