Fix 'function ends without a return statement' error
Merge branch 'patch-1'