new version
Merge pull request #36 from o2ri/master

new version