return a promise
update readme
update package.json
resolve merge conflict
add keepExtensions test