Various 20th Century fixes...
Merge pull request #27 from delphiactual/master

Various 20th Century fixes...