Fixes #3 and #5