Refactoring -.-'
Merge branch 'develop' of github.com:Visualista/Visualista into develop