Fixes #59 and fixes #60