added the amazon keys
Added Maile class
Merge branch 'master' into Gal