Merge pull request #199 from Jedwondle/master

Got the Component requests complete.