updated for celluloid 0.14.0