Added Singleton design pattern, Fixed #3