Main module - version 1
Merge remote-tracking branch 'malaliwi/master'

Conflicts:
	.project