Initial commit feature3
Fixed bug in f3