Fix typo and formatting issue (+ merge into master branch)

This fixes the typo and formatting issue. It may not seem like much, but it leaves a great impression on other coders.

Also, I've merged this into the master branch.