Modified for mac build
Merge branch 'master' of https://github.com/bountycoin/BountyCoin