A few fixes.
I accidentally removed a few important changes @Folis made.
Merge branch 'master' of https://github.com/HmmmQuestionMark/gjms

Conflicts:
	gjms/__init__.py