Merge branch 'release/1.0'
Merge branch 'release/1.1'
PSR2 aware now