brought development up to date with master
added in support for closure as well as interp/decorator options