Merge pull request #18 from rctoris/stable

r2 release