Adding inbound endpoint related fixes.
Merge pull request #23 from iuj/master

Adding inbound endpoint related fixes.