Enhancement: add aws conf
Merge pull request #54 from till/topics/aws-conf

Enhancement: add aws conf