componennt upgrades
Merge pull request #261 from dotch/master

component upgrades