TGriffin clean up
Merge pull request #103 from r3dunlop/dev

TGriffin clean up