Feature #6
Updated feature #6
Merge branch 'test6'