Merged pull request #5 from amcgowanca/feature/refactored