Fixed to use Google methods rather than object properties which change regularly. fixes #7