Fix expecta and pull in latest master branch