refactoring
Merge branch 'develop' of github.com:7bits/natural-exchange into develop