AUTO-496 fix warnings. refactor
Merge pull request #136 from GrabNetworks/auto496

AUTO-496 fix warnings. refactor