Merge pull request #15 from alxnek/master

Updating my master
Another redesign
Merge pull request #19 from motherdear/master

redesign