Fixes #5 and #6