phpdoc fixes
Regex fix. Allow nested placeholders
Fix include process