Merge pull request #1 from KHP-Informatics/master

update