Fixes #13, Fixes #12