Merge pull request #24 from delphiactual/master

S -> Z
Merge pull request #25 from delphiactual/master

...
Various AR fixes