Change static class to singleton
Merge pull request #2 from collectivism/develop

Change static class to singleton