merge sindresorhus' changes