Bugfixing, changed delimeters to avoid collision with regular expressions