Fixes #6 and #7