Small changes for gem v1.0.0