Merge pull request #37 from mastercoin-MSC/master

Merge stuff
Minor bug fix
Merge pull request #886 from sagyeli/Issue_829

Issue 829