Merge pull request #342 from FiloSottile/master