PSR-4 Compliance
Merge branch 'refs/heads/0.1.2-dev'