Merge pull request #42 from davegonzalez/master

Mid-day pull request