replacement
Merge branch 'dev'
issues with .png