Formatting
Merge remote-tracking branch 'origin/master' into brandon_release
Merge pull request #114 from branflake2267/brandon_release

Brandon release