Pasted in the v2.6 changes

And did some general cleanup for consistency, typos and format.
Merge pull request #3 from Tourorist/patch-2

Pasted in the v2.6 changes