bumping to v1.0.0
merge conflicts