Now the code is following most of PSR Various changes from various branches (some testing will be required) Fixed various issues