Changes in roger-branch
Merge pull request #1 from rogerjaffe/roger-branch

Changes in roger-branch