Replaced magic numbers with documented constants
Updated Gson to version 2.2.3