pull request number 2 YFZ full edition

i hope that u'll enjoy my work. thank you.