updates #119
Merge pull request #327 from fgiannar/develop

updates #119