Fixed the stuff i messed up
Merging stuff
Merge branch 'master' of https://github.com/dracul89/unhandledException