fixes issue 1
Change return value
Merge branch 'iss1'