remove singleton
Merge pull request #6 from Kevin2030/kevin

remove singleton