Merge branch 'release/1.2.0'
Change to use PSR
Merge branch 'hotfix/1.2.1' into develop