Fixed syntax errors
Merging. Fixed syntax erros