Fixes issues #10 and #11.