Fixes #2 and #5