remove eval() from Singleton
Merge pull request #182 from DanielPlainview/master

Eval is evil (singleton)