issue-18 fix
Merge branch 'issue-18'