[ZD#42] Fix for 42
Merge pull request #19 from dbuchi/dbuchi/ZD42

[ZD#42] Fix for 42