Merge pull request #51 from brentthorne/daily-dev

Daily dev