Update 0.0.2
Merge branch 'dev'