Merge pull request #17 from bambamx/master

Merge master to test
Merge pull request #18 from bambamx/test

Merge pull request #17 from bambamx/master