Merge origin/master

Conflicts:
	src/napster.py
Merge origin/master

Conflicts:
	src/napster.py