NLADP/ADF — pull request #1 by rboeije (2012-07-05 15:50:33+00:00)
Title: Oiko

Merge of oiko version to master branch