merged patch #147 from vip