RESOLVE MYG000-177
MYG000-177 Fix review
Merge pull request #69 from Jero786/MYG000-177

RESOLVE MYG000-177