First commit
Merge pull request #1 from webNeat/amine-dev

First commit
conflict fixed