0.0.2 Final changes