Merge pull request #1 from ktekinay/develop

Some code cleanup
Merge pull request #1 from IntelligentVisibility/master

Merge changes