Fixes issues #1 and #7