Merge pull request #1 from shk3/master

merge to update