Merge pull request #1286 from elevow/myupdate