fixes #313
Merge pull request #319 from fgiannar/develop

fixes #313