Version 2.0.0 fixes #1