Defect fix
Merge pull request #28 from ryanshawty/defect_fixes

Defect fix