Fixes - round 10
Merge pull request #190 from vpc/magazine

Fixes - round 10