merge with develop
Merge pull request #20 from openjaf/develop

merge with develop