Solved Issue#32
Merge branch 'hotfix/Issue#32'