Support for sparkle
Merge branch 'sparkle'