Merge branch 'magazine'
Merge pull request #322 from vpc/master

Merge branch 'magazine'