Merge pull request #1 from kr/master

Update