[ZD#43] Fix for 43
Merge pull request #20 from dbuchi/dbuchi/ZD43

[ZD#43] Fix for 43