Fixes - round 9
Merge pull request #188 from vpc/magazine

Fixes - round 9