Merge pull request #36 from brentthorne/daily-dev

Daily dev