Doing more cleanup
Cleaning
Merge branch 'release/0.0.3'