fixes some issues
Merge remote-tracking branch 'origin/master' into beta
version 0.33.3b7