Tax categories added.
Merged origin master.
Minor changes.