close #143
Merge pull request #164 from fgiannar/develop

close #143