Merge pull request #4 from raistlinthewiz/develop

Sync master with develop.
Merge pull request #6 from raistlinthewiz/develop

Sync master with develop.
Merge pull request #36 from CoiniumServ/develop

Sync master with develop
Merge pull request #37 from CoiniumServ/master

Master