Merge pull request #1248 from kumpera/kill_the_interpreter