Merge of thezoggy/1080p and Pistachitos