refactored deprecated function call
Merge branch 'master' into dev