fixes #14 and #10