Revert "merge"
Merge pull request #3 from horato/revert-2-master

Revert "merge"