Added necessary methods
Made it non-event based
Added necessary methods
Made it non-event based
Merge branch 'develop' of github.com:Visualista/Visualista into develop