Fix critical error on first run
Merge branch 'develop'
Merge pull request #4 from BitShares/master

Fix bug