#16 Added support for fade-out transition