Merge pull request #34 from ArcBees/brandon_fixes

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