NLADP/ADF — pull request #4 by rboeije (2012-11-28 14:54:29+00:00)
Title: Titan

merge Titan changes to master