New 2 test + modif
Merge branch 'develop' of https://github.com/7bits/natural-exchange into develop