1.0.1 bug fixes