Resolve some bugs
Merge pull request #73 from Jero786/MYG000-214

Resolve some bugs
Merge branch 'master' into MYG000-212-V2