committing to dev branch
Merge pull request #1 from nhayward/dev

testing pull request