Merge branch 'hotfix/2.0.1' into develop
Using oEmbed for better image retrieval
Bug fix
Refactoring
Merge branch 'release/2.0.2'