fixes
Merge pull request #5 from ondras/master

Merge