Add fail safe and inject time property
Merge pull request #1 from ErsanJSano/master

Add fail safe and inject time property