Rest_in bug fixes
Merge pull request #96 from bnadim/master

Rest_in bug fixes