fix bug of instantiating ret and param wrongly (we should not instn them at the call site)
Merge branch 'master' of https://github.com/fredfeng/Scuba