Reverted version 0.0.6 (was never published)