Misc F's
Merge pull request #18 from delphiactual/master

Misc F's