Merge pull request #1 from marsmith/master

test commit from visual studio
Merge pull request #2 from marsmith/master

fix
Merge pull request #3 from marsmith/master

update