Fixes, closes issue #7.