Updated from 3.0.1 from Fabrizio, Sept 2013
Updated for 3.0.1