Added cshtml syntax
Merge