Refactored for DRY
Updated docs for upcoming version 0.6.2