re #168
fixes #168
re #168
fixes #171
Merge pull request #187 from raymak/b168clean

B168clean