with Robs code and changes for performance
removed amazon files
Adeppa first changes
added Adi's code
adi's code integrated
Merge branch 'release1.1'
Merge branch 'shantanu'