Merge pull request #12 from tnason/master

stufff
format and comments
Merge pull request #71 from jamesclampffer/master

code formatted