WHT-31 

Pull request for review from @elmariofredo 
fix comments please