Made components good :)
Merge pull request #1 from Nineage/patch-1

Made components good :)