Fixes #5, Fixes #3