close #256, implemented #212
Merge pull request #257 from fgiannar/develop

close #256, implemented #212