Merge pull request #2 from master