Merge pull request #1 from jamesrhaley/master

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

Revert "merge with james"
my version