Fixes #4 and #10