Fixes - round 6
Merge pull request #185 from vpc/magazine

Fixes - round 6