mac version
Merge branch 'master' into mac

Conflicts:
	linkgetter.py