third changes
Merge pull request #3 from smasterson/third-branch

third changes