Merge differences from nanograv master branch