Merge pull request #11 from alexandru-iacob/master

Push to devel
we have color :)
display re-aranged
Merge pull request #12 from alexandru-iacob/devel

Devel