Redesigned, and completed

Now useful !
Merge pull request #1 from perfaram/master

Redesigned, and completed : Thanks to perfaram