Merge pull request #22 from tmoc/tom

Added more styling.
Improved comments and fixed minor bug.