Merge branch 'develop'
gem it
update readme
Merge branch 'master' into develop