Merge branch 'release/0.0.2'
small updates