fix1

fix1
Merge branch 'Beta-0.8.2.3.E2' of https://github.com/Budy93/Nullcraft-APP into Beta-0.8.2.3.E2