Updated many features, removed singletons and added the error handler.
Merge branch 'master' of https://github.com/gunnar94/Maverick