Fixed OGP
Merge branch 'dev'