Fixes #5 and #8