v2.0.0; closes #11