Merge pull request #1 from aws/master

SYnc