Commented out recursion
Merge branch 'origin/master'