Final version for JoyinX20141226

Bug fixes