add f1 f2 inf
Merge branch 'development' of github.com:kewgen/aow into development