Minor changes regarding installations
	Improved code in installation model
Merge branch 'minor-changes' into develop