Fixes for Issue #19

/cc @westonruter @fjarrett