Upgraded to 2.0

@jwngr Ready for your review.