Fixes - round 7
Merge pull request #186 from vpc/magazine

Fixes - round 7