first commit
Merge pull request #16 from tarataa/master

first commit