Merge pull request #30 from brentthorne/PR-devs

PR Devs to master