Bug Fixes & General Clean up
Merge pull request #447 from christopherleckie/master

Minor Bug Fixes & General Style Clean