Implementing the singleton option #31, pull request #27