new version
Merge pull request #23 from joridos/master

new version