fix for 336
Merge pull request #346 from Cipa/develop

fix for 336