Add some alpha support
merge