3.3
It's no conflict now
merge win32 and linux
merge win32 and linux
merge win32 and linux
Merge remote-tracking branch 'origin/master'
some logic bug was fixed
an encoding bug with neattxt was fixed