another one
Merge pull request #449 from cvogeley/master

another one