daviidy Merge pull request #1 from daviidy/feature-branch