Merge pull request #2 from fruzti/master

Merge test
Merge pull request #3 from fruzti/pr/1

Merge pull request #2 from fruzti/master