Adding in the merge from issue #57 again. Somehow it got back out.