Added composer.json
Fixed bug
Fixed bug