Fix #13, fix #14

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