Merge with master.
Add to exceptions section. Add NSError reference.
Remove duplicate Categories section.

Fix small typo.