fixes #10 and #11