3123123
Merge remote-tracking branch 'origin/master'

Conflicts:
	parser.py
3123123
Config
debug and some fixes