Two new components
Merge pull request #11 from Archon-/task3

Two new components