Upgraded to 2.0

@jwngr Ready for you to review.