Refs #168, after code review fixes