Add to Eyescale/Lunchbox#18 changes