Merge pull request #159 from skogsbaer/types-and-functions-on-stack

Merge pull request #159 from skogsbaer/types-and-functions-on-stack #310