Merge pull request #119 from branflake2267/brandon_bug_fixes

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