Merge pull request #1 from rweng/master

Update