f in phase 2
Merge branch 'master' of github.com:colinpmillar/FLa4a