Fixed error with missing function call
Merge origin/master