making things testable (stubbing network access)
Merge remote-tracking branch 'origin/master'