Robert's change
Merge pull request #1 from rhofstet/master

Robert's change