Merge pull request #424 from kdarbyshirebryant/master