Robert's third change is going in
Merge pull request #2 from rhofstet/master

Robert's third change is going in