Merge branch 'hotfix-1.0.1'
Added SSL Support
Added Amazon Support
Merge branch 'hotfix-1.0.2' into develop