Merge pull request #2 from ronan22/master