Merge pull request #173 from branflake2267/brandon_release

Brandon release
Merge remote-tracking branch 'origin/master' into brandon_release