initial commit
Merge pull request #1 from fippo/master

initial commit