Make codefolding extension work on latest master and cleanup
Correct function devinition
Merge pull request #113 from juhasch/codefolding_cleanup

Codefolding cleanup