Fix infinite recursion
Merge branch 'master' of origin