Minor tweaks for reloase 1.0.0