conflict
Merge pull request #16 from dkovacs/master

conflict lesz