Fixes #10 (forgot to put word fixes in last commit)