This commit fixes #7 and #8.