N & O
Merge pull request #22 from delphiactual/master

N & O