updates #322
Merge pull request #330 from fgiannar/develop

updates #322