Update content
Merge pull request #55 from magento/master

Update content