Nearly merged (manually) changes from Forth interpreter project