Release 0.0.2 merge master to dev