second commit
Merge pull request #1 from mwhammond/master

second commit