Enhanced #14
Enhanced #14
Merge branch 'hotfix/Issue#14'
Merge tag 'Issue#14' into develop

Enhanced #14v0.1