tidy up
tidy up
Merge branch 'develop' of github.com:unmagnify/ruby into develop