updated stuff for v1.0
merge