This commit fixes #58 and fixes #59