merged with authors repo and fixed merge conflicts

merged with authors repo and fixed merge conflicts