Merge pull request #1 from ehis/master

Update