Merge pull request #7 from bambamx/master

Merge stable code