Merge origin/master

Conflicts:
	src/queries/query3.txt
* Fixed File errors