globals bug fix
Merge branch 'develop'
Release 2.1.3