Integrating some feedback ;)
Merge branch 'develop' of https://github.com/APTrust/APTrustDPN into develop