OK let's call them "components" and move on...
Merge pull request #19 from leftclickben/master

OK let's call them "components" and move on...