resolves #10 and #11