Fixes for issues #6 and #7