Fixing syntax error
Merging master