Merge pull request #4 from amcgowanca/develop