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

Revert "Merge"