Merge pull request #687 from rustyswayne/1.3.0

Lots of code comments and file formatting