Code comments
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Housekeeping
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Code comments.
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Code cleanup and documentation
More code comments
Merge pull request #687 from rustyswayne/1.3.0

Lots of code comments and file formatting