Bill doing some cleanup.
Bill doing some cleanup.
Bill merging.
Bill merging.
Merge pull request #413 from badgerProd/master

merging