fixes #10, #11