Merge pull request #4 from mastercoin-MSC/master

Merged
issue 889
Merge pull request #977 from NadavSch/issue_899

Issue 899