Fixes issue 408
Merge pull request #411 from ronnieholm/develop

Fixes #408