Merge pull request #1 from colindean/master