Jackson

Merge dos branches.