Merge branch 'release/v0.1'
Added amazon.yml sample
Merge branch 'master' into develop