Solved Issud#29
Merge branch 'hotfix/Issue#29'