More refractoring
Bump up version to 0.0.2pre1
Bump up version to 0.0.2pre1