Revert "Merge fixes"
Merge pull request #8 from dz0ny/revert-7-master

Revert "Merge fixes"