Merge pull request #1 from Obnoxious/master

Changed the documentation to reflect commit 09697921359e6d5d8997965611a7...
A few minor documentation and comment changes