Added camel case support and fixed delimiter.