fix for #337
Merge pull request #350 from Cipa/develop

fix for #337