Do not premultiply alpha
Merge basics into master