Merge pull request #5 from webNeat/amine-dev

Amine dev
cleaned
version Beta
0.8 Beta