Issue #53 and pull #207 review fixes