Merging pull request #1 from leecrossley