Merge pull request #82 from trontrytel/master

aqq
initial import of dfl option for 1D (not tested yet!)
G in 2D