Implement fix for issue-70 according to change log and test case definition
Implement fix for issue-70 according to change log and test case definition

giserh/hug,MuhammadAlkarouri/hug,MuhammadAlkarouri/hug,timothycrosley/hug,giserh/hug,MuhammadAlkarouri/hug,timothycrosley/hug,timothycrosley/hug