Merge pull request #8 from mwichmann/master

some rework; start trying to detect fptrs.  Merge per conf call