Sonar Major warnings: Hide Utility Class Constructor
Merging master to branch, resolving conflicts.
Fixed some of the changes missing in branch, after comparing with master.
Removed unused import - fixed as part of resolving conflicts.
Merge pull request #53 from neomatrix369/sonarMajorWarnings_HideUtilityClass

Sonar major warnings hide utility class. Fair enough ;)