I need to rethink this..
Merge branch 'particle-sprite'