singleton refact
Merge pull request #13 from prafiny/master

singleton refact