fixes #234
fixes #234
fixes #62 fixes #242