merge from newtheme pandulum