Merge remote-tracking branch 'origin/master' into slave
Merge pull request #2 from iamgarvin/slave

Merge remote-tracking branch 'origin/master' into slave