Code cleanup.
Fixed excess extraction.
Bumped version to v0.2.1.