Added feature 7
Merge branch 'feature7' into develop