Added files ignored by master
Merged background fix