added fade
Merge branch 'master' of https://github.com/parahunter/jellyfish-renderer