second commit
Merge pull request #1 from hohliksmile/master

second commit