Merge pull request #4 from bambamx/master

Merge latest changes
Merge pull request #5 from bambamx/test

Merge pull request #4 from bambamx/master