Merge pull request #4 from carlyeks/master

Adding new components