Merge branch 'dev'
Remove transparent rectangles
Remove blank lines