Merge pull request #29 from karlp/future_f1plusf4