Merge branch 'hotfix/0.3.5' into develop
removed unnecessary function for encoding
fixed import issue when installing via pip
Merge branch 'release/0.3.6'