Fixes #7 and #10