Trying to follow PSR2 rules
Merge