Added in arjootest branch
Modidfied from master