Updates to issues #27 and #10