merge new stuff from Black09/Xperience1080