Upgraded for 0.4

Now passing content_object to custom templates