Merge pull request #414 from raistlinthewiz/develop

Misc changes
Merge branch 'develop' of git://github.com/CoiniumServ/CoiniumServ into develop