fix ws long to int
Merge branch 'hotfix/v1.0.4'
Merge tag 'v1.0.4' into develop

v1.0.4