Upgrade to version 3.3

Hi,

Upgrade original source to latest 3.3 source.

Please check and accept my pull request.

Thanks