Style updated
Merging the branches