12/05/14 components order
Merge pull request #2 from davidfof13/master

12/05/14 components order