Fixes - round 2
Merge pull request #181 from vpc/magazine

Fixes - round 2