Ee cbind fix

This takes care of the issues raised in #37 and #40