close #154, close #197
Merge pull request #258 from fgiannar/develop

close #154, close #197