Add Marble contribution from Calin Cruceru (June 6th, 2014)