Fixes #78, Fixes #77