zedtux Merge pull request #86 from jlopp/patch-1 …