Updated to fix issue 168
Merge branch 'hotfix/fix_issue_#168'