More generic fixes.
Merge branch 'develop' of https://github.com/Visualista/Visualista into develop
Removed all magic numbers in whole project.