v2.0-alpha2; bug fixes and minor improvements, closes #7