New fb fix
Merge pull request #198 from CruGlobal/facebook-fix

New fb fix
Merge pull request #199 from CruGlobal/dev

Dev