Merge pull request #2 from amcgowanca/develop