Few small changes, added composer.json