miscellaneous stuff for testing and validation
--ckell
Merge remote-tracking branch 'origin/master'