Merge pull request #7 from bambamx/master

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

Merge pull request #7 from bambamx/master
Merge pull request #10 from bambamx/test

Merge pull request #6 from bambamx/master
Merge pull request #11 from bambamx/master

merge