Merge branch and format code

Resolve conflict

Resolve conflict

Update
Merge pull request #22 from Jero786/MYG000-114

Update branch and resolve conflict