merge from mr-orange Pistachitos