Merge pull request #4 from bambamx/master

Merge latest changes