updated with Jeffreyg changes
Merge pull request #1594 from rboucher/masterRob

updated with Jeffreyg changes