Patch by @IvanSingular
Merge branch 'master' of github.com:mdbs99/aws