Merge pull request #228 from csoroiu/master

A bunch of small changes after gson addition (mostly android)