Revert "merge with james"
Merge pull request #2 from jdgeller/revert-1-master

Revert "merge with james"