Merge branch 'release/0.2'
Merge branch 'release/0.2.1'
fixed image position with Jane's help
Merge branch 'hotfix/fixing_image_position' into develop