Moved code
Merge branch 'develop' of https://github.com/Diversify/multivaders into develop