Added a lot of Javadoc. Renamed WaitForEvent to WaitFor.
Merge remote-tracking branch 'origin/1.6.2' into 1.6.2

Conflicts:
	README.md