Fix for IZPACK-1024
Merge pull request #152 from unb/master

Fix for IZPACK-1024