Fixed a couple bugs introduced in the refactor and changed the decorators to use ._super to call the original method
Bumping to version 0.4.0-rc2