Update autoloader
Improve tokenizer to force newline on @ directives