Merge pull request #1 from cinder/master

Update