Fixes - round 3
Merge pull request #182 from vpc/magazine

Fixes - round 3