Fixes #11, Fixes #12