Fixes #63 and #62