Merge v0.0.2 into master branch