Merge pull request #31 from rctoris/stable

r5 release
minor cleanup