Merge pull request #24 from siroken3/devel

Devel
Merge remote-tracking branch 'origin/master' into 32_botocore