battle patch

gh
Merge branch 'master' of https://github.com/dracul89/unhandledException