My first commit
Merge pull request #36 from kikchy/master

My first commit