Merge pull request #37 from mvanduijker/master

Update dependencies
Fix autoload when conveyor is required through composer