Wrapping up v2.0.1