Stopping animation when we've run out of frames to display
Merge branch 'dev'