Added Features 3
Merge branch 'feature3'