Merge pull request #1 from RobertJGabriel/master

pull from Rob