Converted variable names to CamelCase as convention
Merge branch 'master' into tfmhttpd