fixing code style
Merging master