finished 367 celluloid
Merge pull request #301 from fireweb/master

finished 367 celluloid