fixed wrong return type / compiler warning
Merge branch 'master' into develop