Merge pull request #28 from brentthorne/daily-dev

Daily dev