Pr 167

Tweaks to #167