cm0017
Merge pull request #4 from razsh/change_request_003-rc1

cm0017