Late night coding. :) :(
Merge branch 'develop' of https://github.com/Visualista/Visualista into develop