Initial Commit for Pull Request

This is an initial commit to initiate a pull request from Jackson's
repo. It contains the beginnings of some modifications, but is mostly
still identical to Jackson's code.
Merge pull request #1 from erturpin/master

Our initial pull