Fixes some nasty crashes
Merge branch 'master' of https://github.com/MMeent/MANTHIS-terminal

Conflicts:
	Main.py