Merge pull request #1 from icanhazdevops/master

Pulling from upstream