litle fix and validation
Merge branch develop of https://github.com/APTrust/APTrustDPN into develop