Updated version (0.0.7)