more changes in morefunc.c
ofunc.c
Merge branch 'iss57'