Changed Singleton to Static
Renamed Singleton class to Static
Merge remote-tracking branch 'origin/master'