Fixes #3 and #4