Mike's commit
Merge pull request #1 from mpettit/master

Mike's commit