merge pull requests, update readme, fix tests