[ZD#3] Fix for that feature
Merge pull request #10 from dbuchi/dbuchi/ZD3

Dbuchi/zd3