fixes #62
fixes #62 and merges