CURRIKI-6057

Adjusted class to match style plan
Merge branch 'master' of https://github.com/xclams/neaGPS