adding back changes lost during derpy merge conflict resolution
Merge pull request #54 from calebhailey/master

adding back changes lost during derpy merge conflict resolution