Fixes #3, fixes #4