Fixes #10, Fixes #13