fix #43,#44,#45,#46 (at Rollbar)
Merge branch 'hotfix/0.3.1'