issue 5
Merge branch 'feature4'
issue 7
issue 5
Merge branch 'feature4'

Conflicts:
	features.txt