speed up + fix
Merge branch 'develop'