Replaced deprecated method is_return();
Merge branch 'issue-44' into develop