Final changes to version 0.0.2