Commit four
Merge pull request #4 from evhub/develop

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