Merge pull request #21 from branflake2267/brandon_fixes

Brandon fixes
Merge pull request #22 from branflake2267/brandon_fixes

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