Merge pull request #18 from openjaf/develop

Develop
update gems
merge with master