Fixes - round 8
Merge pull request #187 from vpc/magazine

Fixes - round 8