WHT-31 

Pull request for review from @elmariofredo 
please add proper description with all requierements

Thanks