First version
Merge branch 'master' of https://github.com/mrod/aws
First version