Merge changes from javan/whenever

Add latest changes.