fix issue with returning before completion
fix nitn
Merge pull request #3 from keertip/tavern

fix issue with return before completion