Initial commit feature3
Fixed bug in f3
Merge branch 'f3' into mp1