Fix #82, #83: Upgrade to release v2.0.0