Fix #233, implement #81

Signed-off-by: Ross Allan <rallanpcl@gmail.com>