Merge branch 'release/1.0.0' into develop
Reformat code according to PSR1-2 and remove some imports
Merge branch 'release/1.1.0'