fix issue with clashes between php and html syntax.  fixes #16
Merge branch 'bugfix/16'