some more work
Merge branch 'master' of https://github.com/alinh/RMS