Fixes -  round 1
Merge pull request #180 from vpc/magazine

Fixes -  round 1