Fixes for bad merge...
Merge pull request #61 from delphiactual/master

Fixes for bad merge...