reformatting and minor updates
Merge pull request #44 from wick-ed/master

reformatting and minor updates