changed return value
Merge commit 'd1f9573'