fixes #180
Merge branch 'issue-180'
version 1.12.0