Fixes #10 and preps for 1.4