Fixes + tweaks + performance improvements
Merge branch 'master' of github.com:alisnic/press-kit