Merge remote-tracking branch 'origin/master' into New

Conflicts:
	Nowy/main.py
Merge pull request #1 from Vallher/New

New