2.3.2

code clean up
fixed issue#1