new verion
Merge pull request #24 from joridos/master

new verion