close #402
Merge pull request #403 from fgiannar/develop

close #402