Adding support for before/after(:step) #14