studio-api sonar issues
Merge pull request #121 from dejan-brkic/master

studio-api sonar issues