version 2
Merge pull request #15 from viliusle/master

version 2