Merge pull request #1 from matthewmn/master

test commit 2