re-removing the license since this is a private repo.
Added specifics to the inbound data.
Fixed the conflict.
Merge pull request #123 from Adron/master

Minor cleanup and jazz.