fixes #14
fixes #10