Merge pull request #2 from cornelusleroux/master