Commit two
Merge pull request #2 from evhub/develop

Verified passes tests by evhub. Verified looks good to evhub, ripplebot.