Merge pull request #2 from mikecardwell/master