Fixes #14 Amended per comments