Merge branch 'spritefile'