Merge pull request #136 from branflake2267/brandon_fixes

Brandon fixes
Merge remote-tracking branch 'origin/master' into brandon_fixes