Merged pull request #1 from amcgowanca/test/develop