updated 1.0, commited v1.1 to git