Revert "Changes in roger-branch"
Merge pull request #2 from rogerjaffe/revert-1-roger-branch

Revert "Changes in roger-branch"