Fixes #12 Fixes #5