PSR4
WIP exceptions
Exceptions
Merge branch 'develop'