incorporating @sc68cal's suggestions.
incorporating @thomaswurtz's feedback from issue #298 https://github.com/git-tfs/git-tfs/pull/298#issuecomment-12757119