commit #007 - 004
commit #008 - 001
commit #007 - 007
commit #008 - 002
Merge remote-tracking branch 'origin/#008' into develop

Conflicts:
	README.md
testing for gitlab mirror