Changes for the release of V0.2