Removing decorator package dependency, resolves #46