Merge pull request #2 from reardestani/master

Redesign
Merge pull request #3 from reardestani/master

Tracking code
Merge pull request #4 from reardestani/gh-pages

Make it correct