first commit
Merge pull request #1 from cfillak/master

first commit