Merge pull request #1 from KHP-Informatics/master

update
Merge pull request #1 from snewhouse/master

Merge pull request #1 from KHP-Informatics/master