Issue_137
Merge pull request #138 from n-lagomarsini/issue137

Issue_137