Revert "Feature/fix fade"
Merge pull request #26 from lordmat0/revert-25-feature/fix_fade

Revert "Feature/fix fade"
Should not have been merged into master