Scott's commit.
test commit :)
fixed Scotts branch
Merge branch 'dotGiff-Scott'