Fix #59 Fix #60
Revert returns
Moved things forward to rc-12