Merge changes from http://www.healthcare.uiowa.edu/labs/au/IDP/files/IDP_0.1.7.tar.gz