AUTO-525 AUTO-526 AUTO-527
Merge pull request #143 from GrabNetworks/refactor-fixes

AUTO-525 AUTO-526 AUTO-527