Merge pull request #11 from neinderthal/develop

Develop
Issue #7 is addressed with this.
Merge branch 'master' of github.com:neinderthal/river into develop