updates #311
Merge pull request #338 from fgiannar/develop

updates #311