Version 3.2.0

Updated code for all changes made in 3.2.0