Merge pull request #6 from bambamx/master

Merge pull request #5 from bambamx/test