Merge branch 'develop'
FIx error with terms to occurance
Merge branch 'master' into develop