Fixes #4 and #7