Fixes
Merge pull request #184 from vpc/magazine

Fixes