issue #264, converted ask and wait block to expression from step
Merge pull request #357 from klindenbach/master

issue #264, converted ask and wait block to expression from step