Merge pull request #26 from brentthorne/daily-dev

Merge pull request #25 from brentthorne/master