nicklockwood Merge pull request #6 from Coeur/master