Fixes #7 and #9