Merge pull request #15 from tpokorra/master

fixes for nightly devzip