Small changes

Added the changes from v0.32 - Calling it v0.33 now due to the GMP
addition.