Merge pull request #162 from Bonbons/master

 	Others fixes on general
d237: yinzanat and Jigoku fixes (#160 and #162) due to new general layout
Merge pull request #4 from magowiz/master

update