Fix issues #4 and #5.
Bump version to 2.1.0. [admin]