Merge pull request #1 from bitstadium/develop

Develop