Update Gonzales PE
Clean up tokenizer
Release 3.0.5 version