Fix #17: Upgrade to release v2.6.0