Merge pull request #449 from gregoryjordan/master