Merge pull request #35 from tommyschnabel/Tommy

Tommy
Working on implementing Jackson