Rebase for pull request for issue #197
Rebase for pull request for issue #197
cleaning pull request for issue #197
refactoring pull request for issue #197