More corrections.
Merge pull request #255 from travisbrown/master

More corrections.