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

updates #119 - better implementation