global singleton
Merge pull request #22 from funkytek/master

global singleton, todo cleanup