Minor edits
Merge branch 'master' of https://github.com/bronevet/sight into mergeDevelop

Conflicts:
	Makefile