todo
retoques
Merge pull request #3 from sesteva/master

new look and feel