Issue_137

This pull request contains a fix for #137. When the pull request is merged, wiki should be updated.