Fix Dudu's mess :)
Merge branch 'master' into dudu

Conflicts:
	trader.py