Merge pull request #33 from brentthorne/daily-dev

Daily dev