bln fix -> maxwen is awesome :p
merge pull from LorD part 1
merge pull request from LorD part 2