Polymer

merge polymer branch into master