a little bit of clean up
Merge remote branch 'origin/1.0.0-dev' into 1.0.0-dev