Merge pull request #2 from brandonw/master

Thanks!
More formatting and style changes