Fixes on facebook
Merge branch 'master' of https://github.com/sirolf2009/Katy