Code cleanup
updated composer deps
Merge pull request #3 from paradoxe/master

update composer