Merge pull request #3 from magowiz/master

update
Others fixes on general 

Others fixes on general
Others fixes on general 

Others fixes on general
Others fixes on general 

Others fixes on general
Others fixes on general

Others fixes on general
Merge pull request #162 from Bonbons/master

 	Others fixes on general