Added files from 2.0.
Fixed constant name and bumped version to 2.0.