Varios cambios :S
Merge remote-tracking branch 'origin/master'

Conflicts:
	lexer.py