better formfactor
Merge pull request #469 from rdwallis/ffact

better formfactor