Fixes #14 amended per comments.