Sonar quality check performed. Removed magic numbers. Rest of sonar issues ignored. Since not really applicable for this application
Merge remote-tracking branch 'origin/master'