Merge pull request #76 from CoiniumServ/develop

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

Sync master with develop branch.
Merge remote-tracking branch 'upstream/master' into develop