Update from review CR-MAGEDOC-111
Merge pull request #56 from magento/master

Update from review CR-MAGEDOC-111