started merging MASTER branch
also debugging CMUCL regression (issue #3)