Fixes #7 and #8