Adding addon support (before and after)

resolves #73