Fixed #18
Merge branch 'hotfix/Issue#18'