Adding AWS support
Bumped version to 0.4.0
Merge branch 'release/v0.4.0' into develop

* release/v0.4.0:
  Bumped version to 0.4.0