re-commit of 0.0.6