...
Merge pull request #25 from delphiactual/master

...