Merge pull request #7 from bambamx/master

Merge stable code
Merge pull request #8 from bambamx/stable

Merge pull request #7 from bambamx/master