More miscellany
Merge pull request #33 from delphiactual/master

More miscellany