Initial import
Merge pull request #7 from bczirjek/master

Initial import