Merge pull request #1 from philipdexter/master

Some recursive nonsense
Remove function definition and update recursives