Updated files
Updated comments
Refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	Technical Specifications
Refactoring