MYG000-218 Resolve issues.
Merge pull request #70 from Jero786/MYG000-218

MYG000-218 Resolve issues.