Merge pull request #3 from mastercoin-MSC/master

Stuff from upstream
Merge pull request #4 from mastercoin-MSC/master

Merge stuff
Issue #343
Merge pull request #6 from sagyeli/Issue_343

Issue 343