fixes #10, fixes #11