Upgraded to 2.0.0-p353 since I couldn't get 2.0.0-p247 to compile