Merge pull request #2 from TryGhost/master

Merge latest changes