dabing1022/ejoy2d — pull request #6 by dabing1022 (2014-04-06 13:48:32+00:00)
Title: merge the official update

merge the official update