updated composer
updated composer
updated readme
merged develop