Merge pull request #8 from bambamx/stable

Merge pull request #7 from bambamx/master
Merge pull request #9 from bambamx/master

Merge pull request #8 from bambamx/stable