Merge branch 'master' of github.com:einarhjorleifsson/rices
Merge branch 'master' of github.com:einarhjorleifsson/rices