Merge pull request #14 from wirelab/feature/facebook-fix

Feature/facebook fix
Merge branch 'refs/heads/master' into develop