Merge remote-tracking branch 'klemens/master'

Conflicts:
	lib/URIChanger.js
	lib/main.js