Fixes #4, Fixes #5