Sync'ed this version with the melonJS repository