Merge branch '0.3-beta' of github.com:mmcgrana/ring into 0.3-beta