Merge pull request #13 from ellensi/CrossFade

Merging after visual inspection that things look alright.