Merge pull request #2 from fruzti/master

Merge test