Function autoloading

merge master and fix build