Fixes #57 + typo fix