Added Chris
de-conflicted
Merge pull request #3 from newdynamx/bug-84

Added Chris