Fixes #12 Fixes #11