Fix of issue #80
Merge pull request #81 from zvrana/master

Fix of issue #80