Miscellaneous
Merge pull request #32 from delphiactual/master

Miscellaneous