Prep for final merge and v1.1.0