First iteration of Main
Merge branch 'master' of github.com:Visualista/Visualista