Add Amazon support
Merge pull request #25 from ekohl/amazon

Add Amazon support