Fix issue 118
Fix issue 201
Fix issue 118
Merge branch 'issue_201_fix' into issue_25_fix