It actually works now.
Merge remote-tracking branch 'origin/master'

Conflicts:
	HostnameChanger.py
It actually works now.