Code reformating using project's code standart
Merge remote-tracking branch 'origin/master'