v0.0.6 - Implemented Issue #7