Merge pull request #17 from bambamx/master

Merge master to test