Fixes #10 and #11