Revert "Revert "Merge""
Merge pull request #6 from amazon/revert-5-revert-4-merge

Revert "Revert "Merge""