Merge pull request #48 from habuma/master

Update to Jackson 2