Updated version v0.0.7