Release 0.0.2 merge to master