Implements #358
Merge pull request #370 from fgiannar/develop

Implements #358