Merge pull request #3 from fgreg/SDAP-30

SDAP-30 fixed.