Updates for adding non image elements
Fixing bug when animating at a size larger than the image
Merge branch 'develop'