import new upstream version

UPDATED: 04/24/2013 M_G pointed out that space didn't work properly on
writecube.. (fixed) Thanks M_G!!