Updated dependencies & fixed phpdoc
Merge pull request #169 from Bladrak/updateComposer

Updated dependencies & fixed phpdoc