Fixed compile error
Merged changes over from incorrect branch...

Merge ../WeScheme-paul