added eliot
Merge pull request #2 from newdynamx/bug-42

Bug 42
de-conflicted