Updating to 2.0

Fully updated and revised for 2.0. Corrected some errors and standarized
the form of the verbs.
Remove duplicated question
Merge pull request #43 from Belelros/master

Updating ES and small fix