bugfix
merge
Merge branch 'madeleine' of https://github.com/PremKolar/MT4 into madeleine