Merge pull request #413 from badgerProd/master

merging
Bill merging.