jdonaldson Merge pull request #6 from CombatOrpheus/master