Merge pull request #82 from ripple/staging

Merge from staging