Merge tag '2.1' into develop

Updated with taxonomy support and nicer interface.