Merge pull request #1 from DaveVoyles/master

Sync to palermo github