Adding inbound endpoint fixes.
Modified task implementation.
Merge remote-tracking branch 'upstream/master'
Merge pull request #53 from iuj/master

Adding inbound endpoint fixes.