Merge pull request #2 from pirati-cz/master

update from upstream