Added setUp() instructions in documentation
Fixed code formatting
Merge branch '2.0' into 2.1
Merge branch '2.1'