Adding cleaned up version of changes made by Dave here: http://github.com/dotnetnomad/tempest/commit/f2aaedd38eb4d4b9697ca364c2b11d5f6d50b5f5
Adding cleaned up version of changes made by Dave here: http://github.com/dotnetnomad/tempest/commit/f2aaedd38eb4d4b9697ca364c2b11d5f6d50b5f5

fitzgen/tempest