Insert return code
Fix confrict
Merge branch 'prototype'