Merge pull request #19 from delphiactual/master

G-K
L-M