Merge pull request #1 from CCrosbyweb/master

changes