Fix to issues #9 and #10.