Satisfaction in the works
Gson added.
Merge origin/master