Second changes
Merge pull request #2 from smasterson/second-branch

Second changes