Merge pull request #2 from andrewgleave/master