Fixed #519
Merge branch 'master' of github.com:BitShares/bitshares_toolkit