fixes #4
fixes #10