Fixed return value bug.
Improved code readibility.
Updated to v0.2.2