second commit
Merge pull request #1 from lnetmor/master

second commit